[DSL] POC2 by GuillaumeDSM · Pull Request #3299 · Drakkar-Software/OctoBot

GuillaumeDSM · 2026-03-09T20:53:44Z

requires #3277

Herklos

Great feature!!

Herklos · 2026-03-12T11:36:10Z

packages/commons/octobot_commons/asyncio_tools.py



+@contextlib.contextmanager
+def logged_waiter(self, name: str, sleep_time: float = 30) -> typing.Generator[None, None, None]:


Herklos · 2026-03-12T11:41:39Z

packages/node/octobot_node/scheduler/workflows/params/base_params.py

+class BaseHistory(pydantic.BaseModel):
+    completed_iterations: int = 1
+    created_orders: list[dict] = pydantic.Field(default_factory=list)
+    cancelled_orders: list[str] = pydantic.Field(default_factory=list)
+    transfers: list[dict] = pydantic.Field(default_factory=list)
+
+    def update(self, history: "BaseHistory"):
+        self.completed_iterations += history.completed_iterations
+        self.created_orders.extend(history.created_orders)  # pylint: disable=no-member
+        self.cancelled_orders.extend(history.cancelled_orders)  # pylint: disable=no-member
+        self.transfers.extend(history.transfers)  # pylint: disable=no-member


It seems to not be a "BaseHistory" that any history could inherit from but a "TradingHistory" isn't it?

indeed, thanks 👍

Herklos · 2026-03-12T11:50:19Z

packages/node/tests/scheduler/test_tasks_recovery.py

+    octobot_node.scheduler.SCHEDULER.INSTANCE = dbos.DBOS
+
+
+class TestSchedulerRecovery:


packages/trading/octobot_trading/exchange_data/contracts/contract_factory.py

Herklos · 2026-03-12T11:55:29Z

packages/trading/octobot_trading/exchange_data/ticker/ticker_cache.py

+    def is_valid_symbol(self, exchange_name: str, exchange_type: str, sandboxed: bool, symbol: str) -> bool:
+        try:
+            # will raise if symbol is missing (therefore invalid)
+            self._ALL_TICKERS_BY_EXCHANGE_KEY[ # pylint: disable=expression-not-assigned
+                self.get_exchange_key(exchange_name, exchange_type, sandboxed)
+            ][symbol]
+            return True
+        except KeyError:
+            return False


Should we remove this function?

once fully migrated to ccxt cache, yes

Herklos · 2026-03-12T12:06:29Z

packages/trading/octobot_trading/util/test_tools/exchange_data_util.py

@@ -0,0 +1,54 @@
+#  Drakkar-Software OctoBot-Trading


Shouldn't we move these functions outside of test_tools?

😂 I think we should

Herklos · 2026-03-12T12:06:41Z

packages/trading/octobot_trading/constants.py

        ':read ECONNRESET:read ETIMEDOUT'
    )
 ).split(":"))
+USE_CCXT_SHARED_MARKETS_CACHE = os_util.parse_boolean_environment_var("USE_CCXT_SHARED_MARKETS_CACHE", "True")


Herklos · 2026-03-12T12:08:42Z

packages/node/tests/scheduler/test_octobot_flow_client_lib.py

@@ -512,12 +710,35 @@ async def test_run_multiple_actions_bundle_no_wait(self, multiple_actions_bundle


    async def test_run_multiple_actions_bundle_with_wait(self, multiple_action_bundle_with_wait):


Herklos · 2026-03-12T12:09:42Z

packages/node/octobot_node/scheduler/tasks.py

-    if task.type == octobot_node.models.TaskType.START_OCTOBOT.value:
-        handle = await SCHEDULER.BOT_WORKFLOW_QUEUE.enqueue_async(
-            full_bot_workflow.FullBotWorkflow.start,
-            t=workflow_base.Tracker(name=f"{task.name}_{_generate_instance_name()}"),
-            inputs=full_bot_workflow.FullBotWorkflowStartInputs(task=task, delay=delay).to_dict(include_default_values=False)
-        )
-    elif task.type == octobot_node.models.TaskType.STOP_OCTOBOT.value:
-        handle = await SCHEDULER.BOT_WORKFLOW_QUEUE.enqueue_async(
-            full_bot_workflow.FullBotWorkflow.stop,
-            t=workflow_base.Tracker(name=f"{task.name}_{_generate_instance_name()}"),
-            inputs=full_bot_workflow.FullBotWorkflowStopInputs(task=task, delay=delay).to_dict(include_default_values=False)
-        )
-    elif task.type == octobot_node.models.TaskType.EXECUTE_ACTIONS.value:
-        handle = await SCHEDULER.BOT_WORKFLOW_QUEUE.enqueue_async(
-            bot_workflow.BotWorkflow.execute_octobot,
-            t=workflow_base.Tracker(name=f"{task.name}_{_generate_instance_name()}"),
-            inputs=bot_workflow.BotWorkflowInputs(task=task, delay=delay).to_dict(include_default_values=False)
+    if task.type == octobot_node.models.TaskType.EXECUTE_ACTIONS.value:
+        handle = await SCHEDULER.AUTOMATIONS_WORKFLOW_QUEUE.enqueue_async(
+            automations_workflow.AutomationsWorkflow.execute_automations,
+            t=params.Tracker(name=workflows_util.generate_workflow_name(task.name)),
+            inputs=params.AutomationsWorkflowInputs(task=task, delay=delay).to_dict(include_default_values=False)


Herklos · 2026-03-12T12:15:21Z

packages/node/octobot_node/scheduler/workflows/automations_workflow.py

+            created_orders=result.get_created_orders(),
+            cancelled_orders=result.get_cancelled_orders(),
+            transfers=result.get_deposit_and_withdrawal_details(),


Does it represent the bot state? What will this data be used for?

this is the summary of all the actions of an automation that is kept during the whole life of the automation.
The idea is to quickly know the most important things done by an automation during its lifetime

Herklos

Awesome implementation 💯 very nice job !!

Herklos · 2026-03-17T20:56:24Z

packages/commons/octobot_commons/logging/context_based_file_handler.py

+    )
+
+
+class ContextBasedFileHandler(logging.Handler):


Herklos · 2026-03-17T20:58:10Z

packages/flow/octobot_flow/encryption/decrypt.py

+
+
+@contextlib.contextmanager
+def decrypted_bots_configurations(


Herklos · 2026-03-17T20:58:18Z

packages/flow/octobot_flow/encryption/decrypt.py

+):  # pylint: disable=undefined-variable
+    if auth_details.encrypted:
+        raise NotImplementedError("_decrypt_exchange_credentials not implemented")
+        # todo


Herklos · 2026-03-17T20:59:09Z

packages/flow/octobot_flow/entities/accounts/reference_exchange_account_elements.py

+    def has_pending_groups(self) -> bool:
+        # TODO
+        return False


We'll implement this function later on, right?

Herklos · 2026-03-17T21:16:38Z

packages/flow/octobot_flow/jobs/automation_runner_job.py

+        # 2. process on filled and cancelled orders actions if necessary
+        await self._process_on_filled_and_cancelled_orders_actions()
+        # 3. update strategy if necessary
+        changed_elements, next_execution_scheduled_to = await self._execute_actions()


Could we imagine to infer pre-action and post actions actions based on the action to be executed. I mean if it's a "TradingAction" then we expect orders and so call _process_on_filled_and_cancelled_orders_actions but if it's a "CheckAction" or a "whateverAction" it may also need some pre-actions and post-actions that wont be orders processing.
Does it make sense?

yes, post actions are implemented (it's how the stop_automation dsl keyword works), we could also imagine pre_actions if we need them (possibly identified via dependencies)

Herklos · 2026-03-17T21:21:19Z

packages/flow/octobot_flow/errors.py

@@ -0,0 +1,81 @@
+class MiniOctobotError(Exception):


Should we rename it?

Right, it's up

Herklos · 2026-03-17T21:23:50Z

packages/node/octobot_node/scheduler/workflows/automation_workflow.py

+                    next_actions = result.actions_dag.get_executable_actions()
+                    remaining_steps = len(result.actions_dag.get_pending_actions())
+                next_step_at = result.next_actions_description.get_next_execution_time()
+                # TODO next_iteration_description should be encrypted if encryption is enabled


Herklos · 2026-03-17T21:24:50Z

packages/node/octobot_node/scheduler/octobot_flow_client.py

+                # TMP: add a simulated portfolio to the params
+                parsed_description["params"]["SIMULATED_PORTFOLIO"] = {
+                    "ETH": 1,
+                }


Should we add it now or later?

Herklos · 2026-03-17T21:25:31Z

packages/node/octobot_node/scheduler/scheduler.py

+        await self.INSTANCE.delete_workflows_async(merged_to_delete_workflow_ids, delete_children=False)
+        self.logger.info(f"Vacuuming database")
+        with self.INSTANCE._sys_db.engine.begin() as conn:
+            conn.execute(sqlalchemy.text("VACUUM"))


Herklos · 2026-03-17T21:26:49Z

packages/tentacles/Meta/DSL_operators/python_std_operators/base_resetting_operators.py

+"""
+
+
+class WaitOperator(dsl_interpreter.PreComputingCallOperator, dsl_interpreter.ReCallableOperatorMixin):


GuillaumeDSM self-assigned this Mar 9, 2026

GuillaumeDSM requested a review from Herklos as a code owner March 9, 2026 20:53

GuillaumeDSM force-pushed the dsl_poc2 branch 9 times, most recently from 0db3ad0 to 87222d5 Compare March 12, 2026 10:44

GuillaumeDSM force-pushed the dsl_TM branch from 9da8c85 to 24fb111 Compare March 12, 2026 10:46

GuillaumeDSM force-pushed the dsl_poc2 branch from 87222d5 to 7b9662c Compare March 12, 2026 10:47

GuillaumeDSM changed the title ~~[DSL] add resolved_params update octobot_node~~ [DSL] POC2 Mar 12, 2026

Herklos reviewed Mar 12, 2026

View reviewed changes

GuillaumeDSM force-pushed the dsl_poc2 branch 9 times, most recently from 6830064 to 1d4bd0e Compare March 16, 2026 14:52

GuillaumeDSM force-pushed the dsl_TM branch from 24fb111 to 20a5e5b Compare March 16, 2026 15:07

GuillaumeDSM force-pushed the dsl_poc2 branch 5 times, most recently from fff305a to 28a066f Compare March 17, 2026 09:01

GuillaumeDSM force-pushed the dsl_poc2 branch 3 times, most recently from 8ccb0cd to 9c6a19a Compare March 17, 2026 11:27

GuillaumeDSM force-pushed the dsl_TM branch from 20a5e5b to 237e789 Compare March 17, 2026 20:30

GuillaumeDSM force-pushed the dsl_poc2 branch 2 times, most recently from 436a521 to ef4d029 Compare March 17, 2026 20:44

GuillaumeDSM added 17 commits March 17, 2026 22:06

[TradingView] migrate to DSL implementation

d5c7c71

[DSL] add resolved_params and update octobot_node

3ec1d45

[Exchanges] add initialize_from_exchange_data

da17c46

[CCXT] implement shared market status

173a01a

[Tests] add dbos recovery test

4ef54d7

[Exchanges] remove global rest_exchange system

16fcece

[Node] single automation workflow migration

2da63c4

[DSL] add wait keyword

77d079a

[AutomationWorkflow] store all data in task and state

e7f0d37

[Automations] add priority actions

69c89ba

[Automations] refactor and add tests

d6d0fa4

[Automations] add optional automation dedicated log file

dca4299

[Flow] add octobot_flow package

ab1ecbd

[CI] fix octobot flow and node tests

233926d

[StopAutomation] convert to DSL

2bd2ac5

[ExchangeData] refactor into different file

ab117f3

[Scheduler] add delete_workflows

3b9dbfa

GuillaumeDSM force-pushed the dsl_TM branch from 237e789 to c1960cc Compare March 17, 2026 21:07

GuillaumeDSM force-pushed the dsl_poc2 branch from ef4d029 to 3b9dbfa Compare March 17, 2026 21:07

Herklos reviewed Mar 17, 2026

View reviewed changes

[Errors] rename MiniOctobotError to OctobotFlowError

186dcdd



		@contextlib.contextmanager
		def logged_waiter(self, name: str, sleep_time: float = 30) -> typing.Generator[None, None, None]:

		octobot_node.scheduler.SCHEDULER.INSTANCE = dbos.DBOS


		class TestSchedulerRecovery:

		@@ -512,12 +710,35 @@ async def test_run_multiple_actions_bundle_no_wait(self, multiple_actions_bundle


		async def test_run_multiple_actions_bundle_with_wait(self, multiple_action_bundle_with_wait):



		@contextlib.contextmanager
		def decrypted_bots_configurations(

		"""


		class WaitOperator(dsl_interpreter.PreComputingCallOperator, dsl_interpreter.ReCallableOperatorMixin):

Uh oh!

Conversation

GuillaumeDSM commented Mar 9, 2026

Uh oh!

Herklos left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Herklos left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants